gpt: Fix uuid string format

Change GPT UUID string format from UUID to GUID per specification.

Signed-off-by: Vincent Tinelli <[email protected]>
Reviewed-by: Simon Glass <[email protected]>

diff --git a/cmd/gpt.c b/cmd/gpt.c
index 196f50633561d41acab67a1c6a53676610633dcc..3e98821868ee18795d68821cc8e9eea56ff6bec0 100644 (file)
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -54,7 +54,7 @@ static int extract_env(const char *str, char **env)
        if (e == NULL) {
 #ifdef CONFIG_RANDOM_UUID
                debug("%s unset. ", str);
-               gen_rand_uuid_str(uuid_str, UUID_STR_FORMAT_STD);
+               gen_rand_uuid_str(uuid_str, UUID_STR_FORMAT_GUID);
                setenv(s, uuid_str);
 
                e = getenv(s);

diff --git a/disk/part_efi.c b/disk/part_efi.c
index 893cbbdbdaeb5cdbac23b1e24ef0bec7819a33bb..db0c890d5b449987e2a4f1a530bfa8f2341476bc 100644 (file)
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -463,7 +463,7 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e,
                str_uuid = partitions[i].uuid;
                bin_uuid = gpt_e[i].unique_partition_guid.b;
 
-               if (uuid_str_to_bin(str_uuid, bin_uuid, UUID_STR_FORMAT_STD)) {
+               if (uuid_str_to_bin(str_uuid, bin_uuid, UUID_STR_FORMAT_GUID)) {
                        printf("Partition no. %d: invalid guid: %s\n",
                                i, str_uuid);
                        return -1;